Delete threads with no replies

Author: akatsoulas

kitsune/forums/handlers.py

@@ -11,16 +11,15 @@ class ThreadListener(UserDeletionListener):
     """Handles thread cleanup when a user is deleted."""
 
     def on_user_deletion(self, user: User) -> None:
-
-        sumo_bot = Profile.get_sumo_bot()
-        Thread.objects.filter(creator=user).update(creator=sumo_bot)
+        # First get all threads that should be reassigned, then delete the rest
+        Thread.objects.filter(creator=user, replies__gt=0).update(creator=Profile.get_sumo_bot())
+        Thread.objects.filter(creator=user).delete()
 
 
 class PostListener(UserDeletionListener):
     """Handles post cleanup when a user is deleted."""
 
     def on_user_deletion(self, user: User) -> None:
-        sumo_bot = Profile.get_sumo_bot()
         posts = Post.objects.filter(author=user)
 
         post_content_type = ContentType.objects.get_for_model(Post)
@@ -31,10 +30,9 @@ def on_user_deletion(self, user: User) -> None:
             ).values_list("object_id", flat=True)
         )
 
-        # delete individual posts b/c of custom delete method
         for post in flagged_posts:
             post.delete()
 
         Post.objects.filter(author=user).exclude(
             id__in=flagged_posts.values_list("id", flat=True)
-        ).update(author=sumo_bot)
+        ).update(author=Profile.get_sumo_bot())

kitsune/forums/tests/test_handlers.py

@@ -2,7 +2,7 @@
 
 from kitsune.flagit.models import FlaggedObject
 from kitsune.forums.handlers import PostListener, ThreadListener
-from kitsune.forums.models import Post
+from kitsune.forums.models import Post, Thread
 from kitsune.forums.tests import PostFactory, ThreadFactory
 from kitsune.sumo.tests import TestCase
 from kitsune.users.models import Profile
@@ -18,8 +18,13 @@ def setUp(self):
     def test_multiple_threads_reassignment(self):
         """Test that multiple threads are reassigned correctly."""
         thread1 = ThreadFactory(creator=self.user)
+        PostFactory(thread=thread1)
+
         thread2 = ThreadFactory(creator=self.user)
+        PostFactory(thread=thread2)
+
         thread3 = ThreadFactory(creator=self.user)
+        PostFactory(thread=thread3)
 
         self.listener.on_user_deletion(self.user)
 
@@ -31,7 +36,9 @@ def test_other_users_threads_unaffected(self):
         """Test that other users' threads are not affected."""
         other_user = UserFactory()
         thread1 = ThreadFactory(creator=self.user)
+        PostFactory(thread=thread1)
         thread2 = ThreadFactory(creator=other_user)
+        PostFactory(thread=thread2)
 
         self.listener.on_user_deletion(self.user)
 
@@ -40,6 +47,20 @@ def test_other_users_threads_unaffected(self):
         self.assertEqual(thread1.creator.username, self.sumo_bot.username)
         self.assertEqual(thread2.creator, other_user)
 
+    def test_empty_thread_deletion(self):
+        """Test that threads with no replies are deleted."""
+        empty_thread = ThreadFactory(creator=self.user)
+        thread_with_replies = ThreadFactory(creator=self.user)
+        PostFactory(thread=thread_with_replies)
+
+        self.listener.on_user_deletion(self.user)
+
+        with self.assertRaises(Thread.DoesNotExist):
+            empty_thread.refresh_from_db()
+
+        thread_with_replies.refresh_from_db()
+        self.assertEqual(thread_with_replies.creator.username, self.sumo_bot.username)
+
 
 class TestPostListener(TestCase):
     def setUp(self):

kitsune/kbforums/handlers.py

@@ -9,15 +9,12 @@ class ThreadListener(UserDeletionListener):
     """Handles thread cleanup when a user is deleted."""
 
     def on_user_deletion(self, user: User) -> None:
-
-        sumo_bot = Profile.get_sumo_bot()
-        Thread.objects.filter(creator=user).update(creator=sumo_bot)
+        Thread.objects.filter(creator=user, replies__gt=0).update(creator=Profile.get_sumo_bot())
+        Thread.objects.filter(creator=user).delete()
 
 
 class PostListener(UserDeletionListener):
     """Handles post cleanup when a user is deleted."""
 
     def on_user_deletion(self, user: User) -> None:
-
-        sumo_bot = Profile.get_sumo_bot()
-        Post.objects.filter(creator=user).update(creator=sumo_bot)
+        Post.objects.filter(creator=user).update(creator=Profile.get_sumo_bot())

kitsune/kbforums/tests/test_handlers.py

@@ -1,4 +1,5 @@
 from kitsune.kbforums.handlers import PostListener, ThreadListener
+from kitsune.kbforums.models import Thread
 from kitsune.kbforums.tests import PostFactory, ThreadFactory
 from kitsune.sumo.tests import TestCase
 from kitsune.users.models import Profile
@@ -13,9 +14,9 @@ def setUp(self):
 
     def test_multiple_threads_reassignment(self):
         """Test that multiple threads are reassigned correctly."""
-        thread1 = ThreadFactory(creator=self.user)
-        thread2 = ThreadFactory(creator=self.user)
-        thread3 = ThreadFactory(creator=self.user)
+        thread1 = ThreadFactory(creator=self.user, replies=1)
+        thread2 = ThreadFactory(creator=self.user, replies=1)
+        thread3 = ThreadFactory(creator=self.user, replies=1)
 
         self.listener.on_user_deletion(self.user)
 
@@ -26,9 +27,7 @@ def test_multiple_threads_reassignment(self):
     def test_other_users_threads_unaffected(self):
         """Test that other users' threads are not affected."""
         other_user = UserFactory()
-
-        other_user = UserFactory()
-        thread1 = ThreadFactory(creator=self.user)
+        thread1 = ThreadFactory(creator=self.user, replies=1)
         thread2 = ThreadFactory(creator=other_user)
 
         self.listener.on_user_deletion(self.user)
@@ -38,6 +37,19 @@ def test_other_users_threads_unaffected(self):
         self.assertEqual(thread1.creator.username, self.sumo_bot.username)
         self.assertEqual(thread2.creator, other_user)
 
+    def test_empty_thread_deletion(self):
+        """Test that threads with no replies are deleted."""
+        empty_thread = ThreadFactory(creator=self.user, replies=0)
+        thread_with_replies = ThreadFactory(creator=self.user, replies=1)
+
+        self.listener.on_user_deletion(self.user)
+
+        with self.assertRaises(Thread.DoesNotExist):
+            empty_thread.refresh_from_db()
+
+        thread_with_replies.refresh_from_db()
+        self.assertEqual(thread_with_replies.creator.username, self.sumo_bot.username)
+
 
 class TestPostListener(TestCase):
     def setUp(self):